From 58034d80e498037305d562c3ff25e60f7e50ed38 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 25 Aug 2004 20:06:29 +0000 Subject: [PATCH] Steal ATTACHED_MENUS list so its tail isn't freed when we re-set it, 2004-08-25 Matthias Clasen * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS list so its tail isn't freed when we re-set it, noticed by Hans Petter Jansson. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkmenu.c | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 515cc25a7b..860346d4ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-08-25 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS + list so its tail isn't freed when we re-set it, noticed + by Hans Petter Jansson. + * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix a typo, noticed by Tim Janik. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 515cc25a7b..860346d4ec 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-08-25 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS + list so its tail isn't freed when we re-set it, noticed + by Hans Petter Jansson. + * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix a typo, noticed by Tim Janik. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 515cc25a7b..860346d4ec 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-08-25 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS + list so its tail isn't freed when we re-set it, noticed + by Hans Petter Jansson. + * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix a typo, noticed by Tim Janik. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 515cc25a7b..860346d4ec 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-08-25 Matthias Clasen + * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS + list so its tail isn't freed when we re-set it, noticed + by Hans Petter Jansson. + * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix a typo, noticed by Tim Janik. diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 588e8a9ca3..d4be6416fd 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1037,7 +1037,7 @@ gtk_menu_attach_to_widget (GtkMenu *menu, data->detacher = detacher; g_object_set_data (G_OBJECT (menu), attach_data_key, data); - list = g_object_get_data (G_OBJECT (attach_widget), ATTACHED_MENUS); + list = g_object_steal_data (G_OBJECT (attach_widget), ATTACHED_MENUS); if (!g_list_find (list, menu)) { list = g_list_prepend (list, menu); -- 2.30.2